Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 10 May 2010 11:57:09 +0000 (11:57 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 10 May 2010 11:57:09 +0000 (11:57 +0000)
commit4388d2d03fb267ea279ff5e576ee6afd4afd7605
treed26d126b246aa2627bf8be65c7a501b48efa0563
parent7d73ad5bdb461da0ce3e7186103cb8dd0a2e1eb6
parent74e55a818157efeafa104f94e4502b9ad05e09d2
Merge from mainline.